Bug: 34203528 Test: none, purely moving classes around Change-Id: I3cd1d257f948729fda5c04632e7ce9114c40bd0c