Reconcile with jb-mr1-release - do not merge

Change-Id: If5926763f15cb33557ca2550360a205beb9a86f2