DO NOT MERGE ANYWHERE: Update Security CTS to 201606s am: 6970313  -s ours am: 547c544  -s ours am: 8c757b7  -s ours
am: b0fc55f  -s ours

* commit 'b0fc55f4d844513fee2dffddc6b7decba1e4b1c1':
  DO NOT MERGE ANYWHERE: Update Security CTS to 201606s

Change-Id: I4cdb4526a0f8bbb0dd18bef9f6143e6eb0dcac93