Merge from jb-mr1-aah-dev

Change-Id: I2980277ad6342efb6f9f7ad1b13acc8a664c08e5