Update RM to fit AOSB changes

Change-Id: Ie0efb999aee2d0d4cf0cc78ea31df7e840d4e387