am bf5faaca: Merge from jb-mr1-aah-dev

* commit 'bf5faacaebf3e6e87181b3a65f1b8a60976eb6d6':