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

Change-Id: I4a235e4fb1721da985498e7128ffc8d5ad1d6991