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

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