Reconcile with jb-mr1-release - do not merge

Change-Id: I01fd1df9c6d8814ac0a8a92da1f04ca21c6779cb