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

Change-Id: I8825304631a845c96e22c7400a25640585669c09