Merge from jb-mr1-aah-dev

Change-Id: I56ae94f8efe9eecedc17da2f573e8fde2b80d151