am 35557fb7: am 20cdc069: Merge "Changes for vogar compatibility"

* commit '35557fb7262aec7a4ea642ed00aeeca4975cb5a5':
  Changes for vogar compatibility