Bug: 26039641 Change-Id: Ifd96b105f054b67f881529db3fe94718cab4a0f4 (cherry picked from commit 8eaf25856e)
8eaf25856e