Merge "Reindex on OTA and locale change" into oc-dev
am: f84c8d3480

Change-Id: Ia8730a65d7199eefc6054954d2f0f5923dd6aad0