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

Change-Id: I43e520c636ec931fa14f96d2be570d0e29c22e0d