Reconcile with jb-mr1-release - do not merge

Change-Id: I73a0aeb8cfaf12e12eee1b5d6f9549ef24895f62