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

Change-Id: I1e7b348f15da88547b427b182679f5754ab2758c