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

Change-Id: I7b21817142cbdaa51350c0f41751b3f0c45f6ecc