am 1a63351b: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371" into mnc-dev

* commit '1a63351b4b68a9ffb4e55ce8185e13cda6893ec1':
  ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371