Merge "Reinforce comments for newly added provisioning keys" into tm-dev