Closes-Bug: #1372751
Issue: @task is added after role task call. This overwrites
       the role task information
Fixed @task calls

Change-Id: I4d3e726e17297c7eac7a2f69b8e301e91218551b
Merge "Closes-Bug: #1372751 Issue: @task is added after role task call. This overwrites        the role task information Fixed @task calls"