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
am: ebf41a3a8b

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

Change-Id: I0753d0c4a1cadeb38eca5f85f6702d6e76878551