This reverts commit 912db88c. Reason for revert: broke adt3 Change-Id: Ie98bde22004de9e6893d61f18feedeeb4935a58a