Bug: 34193954 Change-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917 (cherry picked from commit 6130fb74)