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

Change-Id: I39db238f1118ff35f31c06f4dc545256fad24baa