Merge from jb-mr1-aah-dev

Change-Id: Ifa8ee5e59bb3f61df4de47d52c062449bdea4911