Bug: 191303529 Test: presubmit Change-Id: I83c8112895a571472e9533b31fb159e723fb4ec6 (cherry picked from commit 9a75e0da)