Reconcile with jb-mr0-release

Change-Id: Ifec547b3abb47c514f60a41d588a916b9bc43dd5