Reconcile with jb-mr0-release jb-release

Change-Id: I02023ae3730a5f9388410a2ac19b282163eb273f