am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"

* commit '4c78d8620514fe1a704872cba66bc1b14d4e2a66':
  tweak for forward-compatibility