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

* commit 'b06dfe142505df7efc729455f30ae73fa3cf6fae':
  tweak for forward-compatibility