Merge "Ignore transform if not set" into rvc-dev am: aab157a4c8 am: 248c1775f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/11525251

Change-Id: I6d3bbe7295d63c27d7af1d14dec4376f0caf2468