Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795