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
am: 349501c18b

* commit '349501c18b3c3243f9a7d5930f41a0ee62152071':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Iee83c22d7e5b4460ffbaea05a01f0976c4e0577c