Reconcile with jb-mr1-release - do not merge

Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3