Merge "Backport missing null check in "adb get-state"." into mnc-ub-dev