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

Change-Id: Id20f7f5e80596123f9c5fdebd97e3e0cb0650cc6