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

Change-Id: If7f0a3cf043e267611910ad8635206335a11cf1b