[automerger skipped] [DO NOT MERGE] Initiailize APP_SEARCH_IMRPOVEMENT flag outside DEBUG builds. am: 1ff2be0dce -s ours am: 96e88222aa am: c9f57a8f85

Change-Id: I9101760a3fbcdb75ea212e585512dd60dc1cd3e7