Merge changes from topic 'taskrunner_details'
am: f11ca98fa0

Change-Id: I8a9173faa1426e15a73bd794e5e328b360bdab45