Merge "dumpsys: fix error condition" into nyc-dev