Reconcile with jb-mr1-release - do not merge

Change-Id: I75192a980be37fe14baa5ee2cd5a69452c161b5e