Merge "Adding tests to detect information disclosure bugs." into nyc-dev am: 96043fd2fb am: e534e43055
am: 325b204d12

Change-Id: I196b9ac6dcdb8e43d0e9e627a7783f4fe6e1213d