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

* commit '6a974cf124727c19496f202576b7520cd22175d1':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I268b1e3d67c2b8cf579c5b88d582ab3b93592aec