Fixes http://b/issue?id=2419208 This reverts commit 32d580c360. Change-Id: I5d8821d52badf3e0347230b86671f8ceb65a663d
32d580c360