resolved conflicts for merge of 90531c44 to master

Change-Id: Ia51e784b350063ea085d7cc62bd693aa3a5be455