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

Change-Id: I9ca9718f196a1eed49060c27e5d261f16d3163d0