Reconcile with jb-mr1-release - do not merge

Change-Id: I140c6ef68bdb8fa5a2e4d1041405ba9f3c85097a