(cherry picked from commit e50f2efab5) Test: works with https://android-review.googlesource.com/c/358172/ Change-Id: I73bb43f0759f4e396ededf4d8ef7f13711c13276
e50f2efab5