Reconcile with jb-mr1-release - do not merge

Change-Id: I3545b3a031bfc602b6d61db2039c8232fe41588a