Merge changes from topic "squashfs+overlayfs"
am: d88b52e7f4

Change-Id: Ifa38f8e48a3110dff9d1339c804855f8a0080ef4