Reconcile with jb-mr0-release

Change-Id: I8eadf20cd941fbf298677537d3771780eca0b07b