This fix has been reverted. Bug: 29083330 This reverts commit 06cd763b. Change-Id: I5382c872caeb7e699de41acaa54ac3ee9f0543e0