Merge from jb-mr1-aah-dev

Change-Id: I7ca9b62574a89ca2c2d17daed100792c05133529