Reconcile with jb-mr1-release - do not merge

Change-Id: Icf259b354e115d0514bb0d6c33beffddb4bbcf35