Merge changes from topic "am-d0ebe25c-c83b-4fa7-aa75-ada153219d90" into nyc-mr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-8400 am: 1af6054730 am: 96cf98469f
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-8400 am: 1af6054730
  [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-8400