Reconcile with jb-mr1-release - do not merge

Change-Id: If88cdd28e163c84b5d6e64eb82b1c322d665a382