Reconcile with jb-mr1-release - do not merge

Change-Id: Ice7d89d927b01c03db60deaa0f00840df514ee96