Reconcile with jb-mr1-release - do not merge

Change-Id: Iac520484dec44e5f54fe0aca54010520aa8fd7e2