BUG: 30839080
BUG: 31007021
(cherry picked from commit 2b54780c88)
Change-Id: I35942e60493adebb22871541a34240368c691ee7
BUG: 30839080
BUG: 31007021
(cherry picked from commit 2b54780c88)
Change-Id: I35942e60493adebb22871541a34240368c691ee7