Fix-up for I4f3534ea2

Change-Id: I90098652cd06db619c0db0f5cb88d62799eae537