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

Change-Id: Id4dcf1e5d36d456a1fea85b8bcce602611dcc4db