[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 am: f6ef78aa93 -s ours

am skip reason: subject contains skip directive

Change-Id: I3ca20389fb7920081a60ed7f2f380b41bdd02374