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