resolved conflicts for merge of 5c2f95ca to master

Change-Id: I1ea30f6a47d50bdd5ce57da53fd5226d1b55bc54