Bug: 37876887 This reverts commit 88d329a6. Test: mm Change-Id: I93880fb7cd8c4c27c65777079d48947075f8cb64