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

Change-Id: I491bbbeac963e58770eaa4d76e418bf4dfa08a41