Reconcile with jb-mr1-release - do not merge

Change-Id: Ibd9aeb4e99444c330c4ab0dcaf510100ad0b6aea