Bug: 118805852 Test: compilation CRs-Fixed: 2494248 Change-Id: I537bec61cd3e7df700cc972683458f977ff370b8 (cherry picked from commit 4c2aa612)