Reconcile with jb-mr1-release - do not merge

Change-Id: Ib03c9a05d1f9d755dea8c93beb270b1eae04ea0b