Test: Local build Change-Id: I3debfb4be795bf7995485f1530dbaa7a24e3cbc1 Merged-In: I3debfb4be795bf7995485f1530dbaa7a24e3cbc1 (cherry picked from commit dd6f26de)