bug: 28535310 Change-Id: Ib508ad085329ec5bc76a96a2e996d6780f8d448e (cherry picked from commit 255836dc)