Reconcile with jb-mr1-release - do not merge

Change-Id: Ib9f5712e4d1a5e0f0b4807cffda4769196c64c21