This reverts commit 20de160ca3. Bug: 7242814 Change-Id: I9ec49a14feb835b6683186fc6da4a74ae19fbae2
20de160ca3