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

Change-Id: Ibab85bbfae15d193b7ef0d75416609ffa895bd91