am a07d37b7: Cherry-pick bug fixes from master.
am a07d37b7: Cherry-pick bug fixes from master.

Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
  Cherry-pick bug fixes from master.

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