Bug: 151454839
Test: See the other CL in the topic
Merged-in: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
Change-Id: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
(cherry picked from commit 451da1ce77)
Bug: 151454839
Test: See the other CL in the topic
Merged-in: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
Change-Id: I4e1d6c419c79663a47341cf26d5229ec17b9ca01
(cherry picked from commit 451da1ce77)