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

Change-Id: If09c3eee19bec544929a3b2a472effcc8be0e077