Merge from jb-mr1-aah-dev

Change-Id: I585cfc00fe77d26c9b9c407d4c4994a340e8c234