Merge from jb-mr1-aah-dev

Change-Id: Icbe58041fdf59c583b15f3d0266f1e0b1e211c9e