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

Change-Id: I850b47e2b1fc1e89c3646e337d6d5d4013982529