Merge changes from topic 'am-c9725ed7d141479aa6dd035636746125' into oc-dr1-dev-plus-aosp

* changes:
  [DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753b am: 8828ffc6 am: edda32c5  -s ours am: af114e02  -s ours am: 332ef64b  -s ours am: c56a72d5  -s ours am: e4f93ecc  -s ours am: c41c875e am: 8e9fca1a
  [DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b2 am: c486b5d0 am: 92c1ca1f  -s ours am: 5cada701  -s ours am: 525c88d2  -s ours am: d9109cc1  -s ours am: a66e843d  -s ours am: e2f98a3f am: f62f9bc1