Reconcile with jb-mr1-release - do not merge

Change-Id: I71bc832ed089ae690aecfc96672986fc09712a58