Reconcile with jb-mr1-release - do not merge

Change-Id: I7e42d7117f567e0dc45c8c1f4a3dc73a8704de19