Merge "ART: Add diagnostic for b/117426281"
am: 28d84669bd

Change-Id: I3fbde0474815ea7698e148c28a2be69908afe708