Merge changes from topic \\'squashfs_ota_incrementals\\' into nyc-dev am: 7354c0e18b
am: 67873bad91

Change-Id: I884b5511d21bfa260444f3c6c32b9f655963a068