Reconcile with jb-mr2-release - do not merge

Change-Id: Id5699382506553a30420c9ae4391315df1695015