Merge "Fix exception spam in ActivityManagerService." into nyc-mr1-dev