DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785  -s ours am: 79770b1927  -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576  -s ours am: 4c9d484078 am: 2823643ecd am: d5e1f1ee8e am: 6a974cf124  -s ours
am: 18fb257140

* commit '18fb25714020b3016e2a8c6d0edd01f8006783f8':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Idc98a2ddeb831563164373022a9a7d80b6f35ff3