Updates and rebase

Updates from Narendra, Oliver, Joanie, Prashanth
Merged changes from master branch

Change-Id: I4ad1cb9026e8d3ec93d0fe60326205ebf5a7ee13