Merge changes from topic "squashfs+overlayfs" am: d88b52e7f4 am: 8aa329d0e2
am: 981b478731

Change-Id: Iafe93b8069a5727533e9c530c8ab9c2567dac8f7