Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change copyright to AOSP

Change-Id: I9b055d015f3c751a3347714788c12270d145d824