Merge changes from topic "am-76da18a1-f110-471a-a87f-39868ce95109" into oc-dev

* changes:
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e am: 648bed8273 skipped: d0a1025778
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e am: 648bed8273
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8 am: 2cd1ad424e
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae am: c88995f5d8
  [automerger] Fix race between SensorManager ctor and callback am: 4b23ed10ae
  Fix race between SensorManager ctor and callback