Merge "The "ps" command has changed in Android O"