Merge "Use OnceKey in art.go"
am: f09a3c3eec

Change-Id: I7a18c6546fdc56aeb75839e30d9fd416b5d38ea9