Reconcile with jb-mr0-release - do not merge

Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5