This is a follow up to 7556dc6a76e011ae08b5a05f9bda29831cf4fac5. Change-Id: I5eb9331410a05e2fedfca728e87414277ff186f7