Merge "ART: Instantiate templated functions"
am: 612c1f60be

Change-Id: I943a4759d93ed9bf5937176be44b48094f912e2e