Reconcile with jb-mr1-release - do not merge

Change-Id: Iad18070370ba8aaed6f73affee0659dbe373e617