Merge "Ignore dumpsys -a option" into pi-dev