Test: Local build Change-Id: Ibc06e91d5f966cf96bead919a6dcbbc243f69712 Merged-In: Ibc06e91d5f966cf96bead919a6dcbbc243f69712 (cherry picked from commit 7274a18a)