resolved conflicts for merge of b1092aea to jb-mr1-dev

Change-Id: I0eb1f731b77049d32569b5e753fefa4900c0c088