Test: tests gonna test, builds gonna build Change-Id: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264 Merged-In: I7f1ef2e82ce2c74253c57de8d73079dcfe2d2264 (cherry picked from commit a2f2d82f)