DO NOT MERGE - Merge ab/7272582 am: 555ca56829

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1736003

Change-Id: Ife20df40b1a45d2f29b5cd9e588b11f6204e64a2