resolved conflicts for merge of 05f1ab8c to master

Change-Id: I2190d297463260ea39d9d427fdac81e5933c1e50