Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3cc1 am: f9e3e40676 am: 2123aad7ab
am: df003a7ba1

Change-Id: I463fa34afc551e61b7367525acc1a180d0d7376b