Reconcile with jb-mr1-release - do not merge

Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803