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

Change-Id: I1e94bdf8a75e813777cdb33fea710a1aabce402e