Bug: 269343928 Test: manually verify against spec Change-Id: Ib8dd7ab2778644e2220622d43f9774c1de6357e9