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: 7b164ae47e

* commit '7b164ae47e9300ab9dcd9713d770095a5db4e333':

Change-Id: I74af7e7bcf70ed46a75ddbc628c13350de167472