Merge changes from topic "am-741f8472fc2540b58147ecfdb6b79484" into rvc-d1-dev-plus-aosp

* changes:
  Merge changes from topic "rollback" into rvc-dev am: 724bc71208 am: 689ae63d5c
  [DO NOT MERGE] Fix NPE from uninitialized object. am: b8544eab9f am: 6be388d12e