resolved conflicts for merge of 5472176c to master

Change-Id: Ib2395d806bb8c029f7743c36cb7849e5589fad7b