Merge commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82' * commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82': More optimization of dumpsys output.
Merge commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82' * commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82': More optimization of dumpsys output.