Merge commit 'b30d6f3fa152be08e8ee9b2a81e971138b5ba62f' into HEAD am: 44bea7ab56

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dwarves/+/38026145

Change-Id: Id1655cee9b546932b5bd5592b4b855e2f4db661d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>