Reconcile with jb-mr1-release

Change-Id: I419f8ce5779288cb2d18b0395e1a21bda80a3d6f