Introduced by Ic155bd29d46059832cce970bf60375e7e472eca6 but not documented in a releasenote. Change-Id: I41e6a3f32e2640fe736ea70a542d9b594bbf328e Partial-bug: #1639293