Merge "Remove boot flag code for Value Aggregation fix" into tm-dev