Reconcile with jb-mr1-release - do not merge

Change-Id: I24595095d111a62fb0525aa8102b04a847aa7538