Reconcile with jb-mr0-release - do not merge

Change-Id: Ia64b2e21461cd8db90a733432dd859824950c211