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

Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493