Merge changes from topic "am-0ec0691a-bb6f-48c9-bb07-2368285b5b41" into nyc-mr2-dev

* changes:
  [RESTRICT AUTOMERGE]: Merge commit '1278eddd11afe16ecaa5e2708cb8087cf066de8d' into am-0ec0691a-bb6f-48c9-bb07-2368285b5b41
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2017-0737 am: 0679a57f0a am: 520a26383a am: 0ba4888227
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2017-0737 am: 0679a57f0a am: 520a26383a
  [automerger] [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2017-0737 am: 0679a57f0a
  [RESTRICT AUTOMERGE]: CTS test for Android Security CVE-2017-0737