This is needed to land I2c5b511df50f29c63aa613899c2bebb506360bf4, see the reasoning on that patch. This reverts commit 6fa7a0974a. Partial-Bug: #1771627 Change-Id: Ia86842b0b1f42512f25390d6bdb695e0f8133c6d
6fa7a0974a