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

Change-Id: Iaf5f03f1cbe7285a141a263821d00d507716031c