[automerger skipped] [DO NOT MERGE] Enable APP_SEARCH_IMPROVEMENTS flag. am: e0ae1afd51 -s ours am: f1ab2b2a9a -s ours am: 2a3f09b657 -s ours am: 0ef40356fe -s ours am: 551a21ef67 -s ours

am skip reason: subject contains skip directive

Change-Id: I6cfc99a8a9f3ce80a6aad3467d2eccec31d83b6b