Bug: 30076851 (cherry picked from commit 8be7c7a5) Change-Id: Ie00f5fa2d38a79e387be9ef567bf49282852c2ad