Reconcile with jb-mr1-release - do not merge

Change-Id: I25b62743f7c6675fa7c43a6499be01ec49de04db