Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401 am: e29b42ffef
am: 2be52191be

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

Change-Id: Iee8b639a565f02cc4e943d7388eb906b88c55e75