Bug: 281044385
Test: presubmit + tested in current release
Change-Id: I1ce6bebd9452466d005505dc5b99a0fdc0e05e80
Merged-In: I1ce6bebd9452466d005505dc5b99a0fdc0e05e80
(cherry picked from commit f47b41a1,
includes changes from commit 57bf60dd
and commit 47fa2f79)