am e710fc70: am 910cf83c: Merge "tweak for forward-compatibility"

* commit 'e710fc70e442604fe300cafb467b9208869c28ed':
  tweak for forward-compatibility