Avoid object access in decorator

Change-Id: I1bbcf357828e3b82a81f41f34a296a33cf67fdd8
Merge "Avoid object access in decorator" into R1.10