Merge "Add metric constants for cross profile settings page" into rvc-dev am: 767e63f5 am: da6d0054 Change-Id: Ie2b8d677ef647ce8313fb4518c961e40d6f90af6