Reconcile with jb-mr1-release - do not merge

Change-Id: I7f4db4d3a8b8db81a6a6c720b0ae3ded73db0825