Reconcile with jb-mr1-release - do not merge

Change-Id: I9e84674df384d2ceea8a1cb357c4f18db0c62ed9