Forgot to add these when the flags were added. Test: manual Change-Id: If71ea756ca85946155d7a6848454f61d137138c0