Merge changes from topic "am-43f19c76-dc30-41fa-ad9d-2650a06f1c02" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f am: f950835e47 am: 850cf9f90d skipped: 3f21c9bb98
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f am: f950835e47 am: 850cf9f90d
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f am: f950835e47
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3 am: 89dde8db5f
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195 am: fa768635f3
  [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-5195