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

Change-Id: If76b46d28612fa7ed5b8bf441c51fad1ebaffa22