Bug: 27645233 Bug: 27441320 Change-Id: I78422f4314ad082adbd983e04510d4dfabe9792d (cherry picked from commit e81ecfe3)