Snap for 7924065 from 4e3fc8468b04ca5016c5ba8b86479c9ce871c5b4 to mainline-art-release

Change-Id: I47bc359ffc8ff1237964562e144508d3ce1ff103