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

Change-Id: Icfa1734085e0a7c8119464154bf3178237396191