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