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

Change-Id: Iabe8a52686407bdbb40d5b9402b4a2b08095a678