Merge "Make status bar disable() debugging more concise." into oc-dev am: e39fa61e0b
am: 1cb53d6888

Change-Id: I0b0b6744a7035bb092cc42eed29cec00dcb4a0df