Bug: 10262585 Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
First version, pending final UX. Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148