Follow up: Ib603f836f59f7078ac5dbb7bbbb3b84ca358cb43 Bug: T137522 Change-Id: Ia5de997fe393ce99a91b16ed397811391a85bc59