Bug: 113037220 Bug: 113111784 Test: manual Change-Id: I91bcd5032959458b926c479160c7e391b8de313b (cherry picked from commit 6aa2d0a5)