Merge "Ignore transform if not set" into rvc-dev am: aab157a4c8 am: 719a977e6b am: 95f05aed58

Change-Id: I7d8b8569ed4f5636bf0c118bb4dc2d017b382f49