Followup 205fa98a: fix incorrect use of .super

Change-Id: Ia1da7cc544074ec7f937a7befeb6a31841b4fd42
Merge "Followup 205fa98a: fix incorrect use of .super"