Bug: 156959408 Test: manual, atest Change-Id: I80de1ea9c4535559f4ca2838a66da9e19eacf49d (cherry picked from commit 4cecd359)