Bug: 144889238 Test: Builds. Change-Id: I2a57767b08c88bbb84cc1dfd4f21f1b3c22af773 Merged-In: I2a57767b08c88bbb84cc1dfd4f21f1b3c22af773 (cherry picked from commit 4e67f841)