resolved conflicts for merge of 6058a318 to master

Change-Id: I66a56101ed27c7727d4b15d1a88f25e8603b36b8