Reconcile with jb-mr1.1-release - do not merge

Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4