nit: Is this all from AOSP or does it contain new code? I'd like a Square copyright header if it's new code.