am 75878ecc: Merge from AOSP

* commit '75878eccc219c02eff6363f1b16a8dab07032322':
  Forward compatibility