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

Change-Id: I267e1d360ee5c4588b9e2844237f6f5a63faa6da