This reverts commit dc06bb0752.
This should go into system/core.
Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
This reverts commit dc06bb0752.
This should go into system/core.
Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287