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

* commit '65499c7a4e36158dd2a66425bd86850bfc92823b':
  Changes for vogar compatibility