DO NOT MERGE Updating security string to 2016-07-05 am: f885e953 am:...

DO NOT MERGE Updating security string to 2016-07-05 am: f885e953 am: 555c5af8 am: 60270ec7  -s ours am: 79770b19  -s ours am: 1fc50f59 am: e496a955 am: afbf8265  -s ours am: 4c9d4840 am: 2823643e am: d5e1f1ee am: 6a974cf1  -s ours
am: 18fb2571

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

Change-Id: Idc98a2ddeb831563164373022a9a7d80b6f35ff3