Reconcile with jb-mr1-release - do not merge

Change-Id: I017b8998e27d05a8763bc2b301d17f8fe6a31a68