Merge "Ignore transform if not set" into rvc-dev am: aab157a4c8 am: 719a977e6b am: 95f05aed58 am: b4c63e5466

Change-Id: I7c32d0e94c3e8e0f77bb3f44d88aba09b0b83e85