Merge "Refactoring information disclosure logic." into nyc-mr2-dev
am: 9cb036edee  -s ours

Change-Id: Id2d4f1e0f02bb04e3b086f51dce1f9931b84d5f6