Test: build Change-Id: I138cd3ea7fd15db3174be25c10d536392180096e Merged-In: I138cd3ea7fd15db3174be25c10d536392180096e (cherry picked from commit 03d71523)