resolved conflicts for merge of 79ee0a9a to master

Change-Id: I110bd412e38358b3d99235bf10fd9d1022aa04e9