Reconcile with jb-mr1-release - do not merge

Change-Id: I67e44ab1acd80a961b813639d41737ac187bbd99