Reconcile with jb-mr0-release - do not merge

Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34