bug: 22184114 Change-Id: I7e7132aa3563f32de32640567b381f8f5bddf491 (cherry picked from commit 6099ee6e08)
6099ee6e08