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

Change-Id: I6f627ab7e473280d29846f3523d8cfe9b648df7d