resolved conflicts for merge of c02c37a1 to master

Change-Id: Iafb9cb4adf27a7086d587d95e94ab1bd050099dc