Test: verified Bug: 37417851 Change-Id: I4be8def41c6479da2d2adaa85a76b9a3dbea0a96 (cherry picked from commit f0a8ef8f)