A20 adaptation

Change-Id: I3bf3570622c849ace772543e9951f7bb5765b07a