am 3f9d7eae: merge from open-source master

Merge commit '3f9d7eaeca27e092302218bac4d1f9aeda59305f'

* commit '3f9d7eaeca27e092302218bac4d1f9aeda59305f':
  empty initial commit