Activity Thread changes

Change-Id: I589fb3fcff9fd5fe67169d084b3978ee02c589a8