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

* changes:
  [DO NOT MERGE] Updating Security String to 2017-08-05 on nyc-dev bug:62388772 am: 2b93753bc4 am: 8828ffc63e am: edda32c5e3 am: 4f43543b11 am: 7801b3d4b6  -s ours am: c012ed7db7 am: 32535d9241
  [DO NOT MERGE] Updating Security String to 2017-08-01 on nyc-dev bug:62388772 am: a847c0b23c am: c486b5d047 am: 92c1ca1f5c am: 93b5d26067 am: dbaa8cfaee  -s ours am: bdc526e833 am: d7e2b3bd06