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

Change-Id: Id6837f3a806b6057afd41c6d307220caeb2bfc6d