Bug: 25472484 This reverts commit 82b8c92b97. Change-Id: I1a8c2e186ad74d78f1c82fe508c6f71c438177dc
82b8c92b97