This reverts commit cbd1ca59. Reason for revert: all required CLs are in AOSP now. Change-Id: Ia03b6db224b361c7e997b109d549502d82817ec0