Bug: 118675557 Test: compile Change-Id: Id2ba95331f87115daf6c0c074faccf812a1661c9 Merged-In: Id2ba95331f87115daf6c0c074faccf812a1661c9 (cherry picked from commit 705dec52)