am 663c2ca: Merge branch \'readonly-p4-donut\' into donut
am 663c2ca: Merge branch \'readonly-p4-donut\' into donut

Merge commit '663c2cadef9a52dd1a9025f1fe22c5d84a3e004f'

* commit '663c2cadef9a52dd1a9025f1fe22c5d84a3e004f':
  AI 147564: Merge back from search branch to donut.  Notes:

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