Merge changes from topic "am-547bd147c34741b8adb948edc35e1c4e" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev am: f8d52afa am: 85517540 am: 9b26ccd8 -s ours am skip reason: Change-Id Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8 with SHA-1 298239b5 is in history
  Use session id to search for rollbacks (2/n) am: 635382ef am: 3a429be3 am: a783a532
  Include session id when sending broadcasts (1/n) am: 0757179f am: 74bc1b64 am: c92af4f4