Reconcile with jb-mr0-release

Change-Id: I61bf607f26244c3149ba7a7dedd041638b46d0e1