Merge "ART: Refactor IRT:Add"
am: fb21f9db75

Change-Id: I3212b7b9b48202502093fb2940b58689d0360a05