Reconcile with jb-mr1-release - do not merge

Change-Id: I36e5d6ccd61dc24a395656f7fdf9a6ca3781a331