resolved conflicts for merge of 9b4660a1 to master

Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed