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

* commit '2823643ecdbfd8ad700834dd292fa2b827072634':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4