Reconcile with jb-mr1-release - do not merge

Change-Id: If617740e2f8eafa49d95ea2efb4769d8145b5eec