resolved conflicts for merge of f739e312 to master
resolved conflicts for merge of f739e312 to master

Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290

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