Reconcile with jb-mr1-release - do not merge

Change-Id: I487c32c629ef85a9aea22fb7564fd868618f56c3