Reconcile with jb-mr1-release - do not merge

Change-Id: I4ab99f1afaeb5abf8220704807cdd9d0fcd45f9d