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

Change-Id: I1c93968d3bd1d9f2f6a2aac77b0ad3297a66341d