Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df  -s ours
am: 4cfcc9fe73

Change-Id: I2f513d397ae199b0ea334d2254ae00a73e0b8026