am a08f7ae3: Merge "tweak for forward-compatibility"

* commit 'a08f7ae3c10f4874194fb48ff549e846e39217b7':
  tweak for forward-compatibility