(cherry picked from commit 1df23cbf)

This does not appear needed anymore.

Bug: 27549740
Change-Id: I3128ab610c742b18008f4cfc2a7116b210f770e7