Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584
am: 539815566f
am: bafe942da7
am: fad5089a5f
am: f0f896c5e8
Change-Id: If45a415de308e9e4957b7035c8d35e5ffdfe2a1c
This commit is contained in: