This reverts commit fcc53f99. Reason for revert: Broke mixed_droid Change-Id: I0f7b864a93624a6be94f8faf55cd9e5175de7f14