Bug: 156020795 Test: manual, atest Change-Id: I72206c7a52b067b77d6542d170a6483713dfeee7 (cherry picked from commit 84e08280) (cherry picked from commit 02bdeeff)