Merge "Fix fastdeploy issues when testing Boat Attack Unity3D demo" am: fafd21159c
am: 3cde42345e

Change-Id: Ia9b1efc0cc27ade12f097b6373e6eb9ffe41975d