Merge "Metrics for user choices in storage wizard." into pi-dev
am: 1786dcd4f8

Change-Id: I360d9249d8109ab4733657fe28277c26124066c1