Merge "Fixed -t order (should be *after* dumpsys :-) am: 3f83dbe2e0 am: 076e8e37b3" into nyc-mr1-dev-plus-aosp