Merge "Updating 2016-07 Strings to Tests for Security Patch String settings" into mnc-dev am: b54ce77c46
am: fc22b756d8

* commit 'fc22b756d86165126d2b612bf818c08caa8d51a4':
  Updating 2016-07 Strings to Tests for Security Patch String settings

Change-Id: Ia311a0a3f70842842f7eaf677053c98ba814ff02