Bug: 29091742 This reverts commit 563df3b328. This also fixes the problems experienced by b/29128683. Change-Id: I8e3d485cb818ea9e03ca475cba88934f6f903f11
563df3b328