Merge "Who wants...to live...forever? The "Save for Autofill?" dialog does!" into oc-dev
am: 53b6f00dc5

Change-Id: I553c58613ea0b1ee933a40f5bcbf6c0c49c8b2dd