Merge "Add metrics for new settings conditional cards." into pi-dev am: 930f74d00d
am: 08276a051c

Change-Id: Ic3b24bd25048a3495e849f3689dc60a59fbda6b1