Reconcile with jb-mr0-release jb-release

Change-Id: If4a370c83e39eea43d31edcc1554ec1aeb539505