Reconcile with jb-mr2-release - do not merge

Change-Id: I2a95a80d2225eb4a27e8bab567f3838b838daf70