Test: Built. Change-Id: I1b07212c58f62104a37a1a702694e163ff4744d0 (cherry picked from commit aa14fee4)