Reconcile with jb-mr1-release - do not merge

Change-Id: Ice6704d7d776ae5efb5ec251fe9809054807c119