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

Change-Id: I3b6420ee322deff3a7caf5a2346452e1964d7a9f