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

Change-Id: I4f7f98b3f4cda9c0c072121913a2a252dd022cfe