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

Change-Id: I764a4490caf910729ff8587debc2e8c4a2fa90dc