Pushing all latest changes for task 1 and task 2

Change-Id: Id2b5373d00de8552756fb003e01340731a058f55
Signed-off-by: biprade <biprade@10.0.0.12>