Add support for "persist" option
am: 42ce7943e1

Change-Id: Ia5bb64e5d99b29afcce5f0b1cd8f6c8ddcbc3559