AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"   Original author: lockwood
AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
  Original author: lockwood

Automated import of CL 145705

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