Manual merge into master
Manual merge into master

Change-Id: Ib71bf36e1205e0bbf1f375cee4a28bceaba60c97

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