Bug: 37534792 Test: none Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927 (cherry picked from commit 4634b5cd)