Merge from jb-mr1-aah-dev

Change-Id: Id2e49b02436a22246cbe058cdb61aba51980789e