Reconcile with jb-mr1.1-release - do not merge

Change-Id: Ib82925ec511d04952e13627e52f188ecb3ceebb7