DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785  -s ours
am: 79770b1927  -s ours

* commit '79770b192771b7e332f1537fef3e3719b07bcf14':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc