am 94077c24: Merge from jb-mr1-aah-dev

* commit '94077c246741fff9f13f727a54e8fe2c2c58d27b':