Reconcile with jb-mr1-release - do not merge

Change-Id: I6144d785b6b161bf3f84f94b5ae8a612eaf8ffca