Merge from jb-mr1-aah-dev

Change-Id: Ia884306cfe4a9389856be0f377351aacf4cb2e36