Merge "Fix build break for target build_test at 5861631" am: e4410af408
am: d65d5412cc

Change-Id: I09e3c04ba1b6749afdf4c9619dd07e5d40d42f13