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

Change-Id: I286356883be0a88252a4ca7468f2413c73df97c7