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

Change-Id: Ib9687c85a000fd3bb08ed710206175e6477c13d9