Reconcile with jb-mr1-release - do not merge

Change-Id: I2147cf8818d13b0d1fafec4bb7e616c90be02c16