Test: make Bug: 67626877 (cherry picked from commit 1acdde37) Change-Id: I90155a3b0bd72eaad927279b9d59ac04cc06222e Merged-In: I56a24514ba6b3a8a7a80a9660a499c54bf51de03