Reconcile with jb-mr2-release - do not merge

Change-Id: Ia951d1acc654210e90b8eb1fd30d154440117127