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: 6a43d01c2b

* commit '6a43d01c2b494249917b7c6ba06e545f6a2de151':

Change-Id: If4aac50fd6cf9dff5be4ba94fd4e3d8d577c58e1