resolved conflicts for merge of 6327a9fe to master

Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64