Reconcile with jb-mr0-release

Change-Id: I7d9679502b2d27db916d3e4e30af26db326835da