In analogy to commit 70d7541daf964240d88f38e8231a0f57fdc56d5b. Change-Id: I18f770da2986653a70fdfa92f3be5e1199d06d08