resolved conflicts for merge of 8ec50062 to master

Change-Id: Iaf036e9e6fff921a8babeab03b669377a308595f