bug: 28797950 (cherry picked from commit fbabe737) Change-Id: I8dd1cccce31d440782a8b7a6210a89576febbdaa