Returned to AOSP frameworks_base