Reconcile with jb-mr0-release

Change-Id: Icff9883db37162d72b2fb24f4d03ef09112a3149