Merge changes from topic 'am-f5a3e00ddcd8443492d7f6bf6ffc2999' into oc-dev-plus-aosp

* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139 am: 35e82a64 am: 89ebb51f  -s ours am: 2d14a7da  -s ours am: 2d19cbf7 am: fa8973ba  -s ours am: 9a805d9e am: 47e5cb03 am: d1174126 am: c4d46c79  -s ours am: 47d4a317 am: e966226f am: c37c1a54 am: 358777c4 am: 752ff908  -s ours am: 5051b385
  [DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de4 am: 8dcfa2ac am: 386d7ae2  -s ours am: 4389a11f  -s ours am: 65101a95 am: 18c3da68  -s ours am: 988fc368 am: 14ef6098 am: a34845a2 am: a73f9cf1  -s ours am: 3720a2f3 am: 597a5a8b am: 859eeaa4 am: b1e5092b am: 19ef36f8  -s ours am: 2ac4273a