Reconcile with jb-mr1-release - do not merge

Change-Id: Ia33579c7a96d90abc59eec8728820e0ef62943f4