Bug: 64382372 Test: make Change-Id: I5640f1c377a8ae174696a4d95d4937e4813f680c (cherry picked from commit fc1c8728)