Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev...

Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514  -s ours am: 4cfcc9fe am: 8a893de6  -s ours am: 9f169ddb am: 5c7bac62 am: 1899a63f am: e10ce804  -s ours am: 6a94730d am: 70accb9b am: 974d64ee  -s ours am: 588a0f85  -s ours am: 5311ff5d  -s ours am: 674c03c3  -s ours
am: 521f5df8  -s ours

Change-Id: I50a39772b875360380fc2c4121c152cddefdfd7c