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

Change-Id: I5551e8502a162a40e80f0c1c5637fd22f5545094