resolved conflicts for merge of eecf00db to master

Change-Id: I7f268122c10152aff8ef59622edbba88db427fca