Reconcile with jb-mr1-release - do not merge

Change-Id: I5428b18f029aa2d74cefe23e27eda2040d711778