am 9e6be435: am a3d40d5f: Merge "Fix some reflection errors"

* commit '9e6be4359e7e3cb44c9ac3957dc9e8d0bbce11c3':
  Fix some reflection errors