Reconcile with jb-mr2-release - do not merge

Change-Id: I15e9944781325d7a44f0d40ab078aec7723ce9ac