Test: build Change-Id: I6fbf26ffd4aba2a45cbed4ef7662c096bedb60e8 Merged-In: I6fbf26ffd4aba2a45cbed4ef7662c096bedb60e8 (cherry picked from commit 61b10de6)