Add support for "persist" option am: 42ce7943e1
am: cb05c54cae

Change-Id: I821ce7715c611ce50953732c504590e0dea5e382