Reconcile with jb-mr1-release - do not merge

Change-Id: I314ff148d62da6265b910056982d55d3608f8b40