Format requirements correctly and sync with global req

some of the requirements that were listed did not match the syntax
of the requirements in global-requirements. also some were out of
date.

Change-Id: I59ee0a07698521b0be85c751ab31368341d83a93