Reconcile with jb-mr2-release - do not merge

Change-Id: Ib54cc659fb7a4fc18df8f98b1c12547d46e23e8e