Reconcile with jb-mr1-release - do not merge

Change-Id: I7a169065f1ec4e36acacdb02c37b51c7036a27bf