Bug: 65596701 Test: manual Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7 Merged-In: I92a436328a3070ea842e8e652891e485406c2ed7 (cherry picked from commit 3eb569fc)