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

Change-Id: I6c2e47e3142a6132f066854500b3a32252233574