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

Change-Id: I5e3cd2a93c6833ac33864c06a1ed5c8e93d9d211