6df7b60998
Bug: 17062445 Change-Id: I027b186719654c2865b08c3fa83f90fa00c1e838 (cherry picked from commit fd5ee9aebc0a43c7f36a0778c7f416b39ddb870e)