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

am skip reason: subject contains skip directive

Change-Id: I6ab76c9b83d6fe475583ca0d2493324f4546c3f7