Bug: 27466931 (cherry-picked from commit 817fba95) Change-Id: Ie5c05e38767c1d4357f825a056a1da80a6d19493