This reverts commit 3dd4c06e. Bug: 122905906 Test: These tests now pass. Change-Id: Ib246e3f3f5579a621d9f2a1b17c223e5940f8025