Merge changes from topic 'taskrunner_details' am: f11ca98fa0 am: aac2688822
am: 2cd07a7e6c

Change-Id: I81c88850958987dfbf0b51860af447f42cc09b63