Bug:30447181 Change-Id: Icea1580f6d919585d488befd62bfa16be7b4a0a6 (cherry picked from commit 4d1e2adf)