Merge from jb-mr1-aah-dev

Change-Id: I852c4972f2ba24e3969a6bb8dfcd60d10c7a0f72