Bug: 35910877 Test: Build (cherry picked from commit 12a747e6) Merged-In: Ia2e966e55d7a6d4d190e77af3af6a568e2ab5dee Change-Id: Ia2e966e55d7a6d4d190e77af3af6a568e2ab5dee