4508c4ab85
Fixes: 191608957 Test: manually using the material showcase app Change-Id: I3a89d200a842b3dd5f34ffc94a2c62c6fab9436e