Bug: b/34054813 Test: VTS, manual - both done in internal branch Change-Id: I5f4962f86b7732e14c2584a562e9737c92310697