Reconcile with jb-mr1-release - do not merge

Change-Id: I84aa6312c38fa1062227d1ffc4cbcb1125cf0bf3