bug: 27748318 (cherry picked from commit 34fa4966) Change-Id: I757bc0290d4dcf6370d967e40b4f9a0187c1aed6