Merge art project from goog/master into goog/mnc-dev.