Also fixes the two conformance issues exposed by Sonobuoy! Change-Id: I0b6bba2a47c7474983414399406d0a68657abb8d