Merge from jb-mr1-aah-dev

Change-Id: Iea13ecd8b6edd42b3dc9c59755d51c1bb36afe4a