Reconcile with jb-mr1-release - do not merge

Change-Id: I4f97bffedf3712fd3c7e07a797d54735a2c456c1