resolved conflicts for merge of 9eecf3fc to master

Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a