Reconcile with jb-mr0-release - do not merge

Change-Id: I23b8891143173a18d563ffaf2ba6aabcc30745ce