[automerger skipped] [DO NOT MERGE] Initiailize APP_SEARCH_IMRPOVEMENT flag outside DEBUG builds. am: 1ff2be0dce -s ours am: 96e88222aa am: 3dfbd16246 am: 0523797e81 am: 5b3ce3f016 -s ours

am skip reason: subject contains skip directive

Change-Id: I3d3edd3d8819f8f1b6c58e019d10804ecff1b5ae