Merge "Only set fullIndex flag when performing a full update" into nyc-mr1-dev