Reconcile with jb-mr1-release - do not merge

Change-Id: If1a0b34f8cfad842a7d95ec26c9a712ceb9218bb