Reconcile with jb-mr1-release - do not merge

Change-Id: I7dd54fd9a5bb7c51979d90beabbb6f00518896b1