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

Change-Id: Iadda1ab11a1cf14b4bbaa283087a3903a3633373