Reconcile with jb-mr0-release

Change-Id: I0fa1791c1e0a7c501af9e0d87f1263207e134310