Merge branch 'stable-2.12' into stable-2.13 * stable-2.12: Change copyright to AOSP Change-Id: I4a7eb3007befa0c83537f6d24529f3f416a25acf