Test: build Change-Id: Ie639f57f86c2573cd5e06a1fa9397487f4b3f235 Merged-In: Ie639f57f86c2573cd5e06a1fa9397487f4b3f235 (cherry picked from commit fd5b1882)