Reconcile with jb-mr2-release - do not merge

Change-Id: Ic8833bf7bc1880c2e6fa3c2c45ae4e55a0be434c