Reconcile with jb-mr1-release - do not merge

Change-Id: I598988c7b0ec650064de569c6120b27c724c478e