Merge "Ignore transform if not set" into rvc-dev am: aab157a4c8 am: 5ae2b2ed09

Change-Id: I5d87d2b6c01ac7ee4bdbc135eecea240762c6360