resolved conflicts for merge of 011132a7 to jb-mr1-dev

Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb