Reconcile with jb-mr1-release - do not merge

Change-Id: I705ea15b9870ea316fa1db2532d4c6b2e7cfa399