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

Change-Id: I13a6417ab49e03a8c636740d59068dd5dc7d702d