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

Change-Id: I6bcb489de05ebc91846cec20d8d645e12cc846da