Merge changes from topic "am-b864c8fa-77cc-4224-b9b6-e13caef57c5a" into nyc-mr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-6789 am: 673a7f6c54 am: 74d40073a2
  [automerger] [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-6789 am: 673a7f6c54
  [RESTRICT AUTOMERGE]: STS test for Android Security CVE-2016-6789