Merge "[incrementa;] set mode and encryption for /data/incremental" am: f7593a9a2a am: bed2e0c828

Change-Id: I4d66d07e66825b999c4e0c461c4fbf19b72b8054