AI 144157: Manually integrate 144143 from donut to fix build.
AI 144157: Manually integrate 144143 from donut to fix build.

Automated import of CL 144157

pranav01/platform_manifest,xorware/android_build,see4ri/lolili,xorware/android_build,RR-msm7x30/platform_manifest,fallouttester/platform_manifest,xorware/android_build,knone1/platform_manifest,Hybrid-Power/startsync,hagar006/platform_manifest,ND-3500/platform_manifest,xorware/android_build,xorware/android_build