DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest. am: 5bce5a16b1 -s ours am: efd928fe56 -s ours
am: 5cf18abca9
Change-Id: I1846d606bdcc35b099f03554107f8ccfe0704a93
This commit is contained in: