am 352926aa: merge from open-source master

Merge commit '352926aa3a8ca45dae3e03a6e0ef6cc6b588e8df'

* commit '352926aa3a8ca45dae3e03a6e0ef6cc6b588e8df':
  empty initial commit