Reconcile with jb-mr2-release - do not merge

Change-Id: Ie6c9c358c616c5271893b6ceb2cf2d50fa209c38