Merge changes from topic "am-460dbfe8-8ec1-4f53-8922-e71d0e56778c" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835 am: 8007b33358 am: 073024cad3 am: 97c562a85c am: 657d2747ec skipped: 02c29b162a
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835 am: 8007b33358 am: 073024cad3 am: 97c562a85c am: 657d2747ec
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835 am: 8007b33358 am: 073024cad3 am: 97c562a85c
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835 am: 8007b33358 am: 073024cad3
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835 am: 8007b33358
  [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2016-3835