Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4
am: db34ed5f83

* commit 'db34ed5f83efc646f37eae8ee61233ee2c2e4979':
  Updating security string to 2016-07-05

Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0