57299dae0c
Note: b/36157561 has been properly fixed.
This reverts commit 08d8bb9cde.
Change-Id: I55e04283d2013f965afc17bcb0482a50440a96ee