Reconcile with jb-mr0-release

Change-Id: I783dd9fbd723bb284932123dfa9e06fb7c7ab879