Merge changes from topic "am-4f4f2004-930f-45c1-a1b7-96d416a12bb4" into oc-dev

* changes:
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4 am: 94a81d141a am: e2cc65bd22 am: e72f7db5c1 am: 546be719c3 am: 9a66602c68 am: 5cf895299e
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4 am: 94a81d141a am: e2cc65bd22 am: e72f7db5c1 am: 546be719c3 am: 9a66602c68
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4 am: 94a81d141a am: e2cc65bd22 am: e72f7db5c1 am: 546be719c3
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4 am: 94a81d141a am: e2cc65bd22 am: e72f7db5c1
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4 am: 94a81d141a am: e2cc65bd22
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4 am: 94a81d141a
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47 am: 8a24cd48e4
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51 am: fc2cdd3c47
  [automerger] CTS for presence of avc fix for b/70897454 am: d71d927f51
  CTS for presence of avc fix for b/70897454