am 0db6f1ed: Need this to update system properties (for change 21876).
am 0db6f1ed: Need this to update system properties (for change 21876).

Merge commit '0db6f1ed396fef320d52f722c45daadf9a98f9ee'

* commit '0db6f1ed396fef320d52f722c45daadf9a98f9ee':
  Need this to update system properties (for change 21876).

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