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

Change-Id: Ica86248c9bcca32e6299bf8280ec2b4f79fc366f