Reconcile with jb-mr2-release - do not merge

Change-Id: I6ae59824a2816429c9d8b2cf698a7170de89cef0