Reconcile with jb-mr1-release - do not merge

Change-Id: I555ff1f5e211d76239808f723ec2d00a0298c617