Reconcile with jb-mr0-release

Change-Id: Id38386cc5408ed6a78f107da8d71d6326020103e