Bug: T322143 Change-Id: I38f465a3e1ab8059beb94fc85ffe1729379d5b7a Follows-Up: I0759b82ad91849880c784e412e04dd53f26df6a2 (cherry picked from commit 1baec7712a)
1baec7712a