This reverts commit cef78d47fb. Related-Bug: #1950379 Change-Id: I871eac8af34e49e771ffa8a7d8076d0bbcbb40ae
cef78d47fb