resolved conflicts for merge of 0aa38562 to master

Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a