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

Change-Id: Iaabea7ad4ff0fe18c6f0320ebf888057e2493357