Merge "ART: Do not use proxy method as owner of lock"