Merge changes from topic "am-fe39afe7-7c6f-4050-9ea6-0dc458cab542" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-0811 am: 43e1a63a75 am: b589356be9 am: 44f9df2473 am: 77f49d1f68 skipped: 382733161d
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-0811 am: 43e1a63a75 am: b589356be9 am: 44f9df2473 am: 77f49d1f68
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-0811 am: 43e1a63a75 am: b589356be9 am: 44f9df2473
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-0811 am: 43e1a63a75 am: b589356be9
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-0811 am: 43e1a63a75
  [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-0811