Merge "Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c am: f8a869d5d8 am: c531f9eea7" into nyc-mr1-dev-plus-aosp
am: cba4c0989e

* commit 'cba4c0989e091e643003e3369eada08310f9e4a9':

Change-Id: I61f5a098e235eb76298e7a17d8378a92b76ca9c0