Reconcile with jb-mr1-release - do not merge

Change-Id: I70866c059c12fdba45761ecbbb6e2a4cf2aa8107