Reconcile with jb-mr1-release - do not merge

Change-Id: I433aa27f430ba1c4555bdee52f239b3d8c81b47c