Reconcile with jb-mr1-release - do not merge

Change-Id: If0c6834e27d91e37a9c553d2e35f0d2e0206cd8a