Sync with global requirements

Update a couple of requirements based on the global
requirements list.

Change-Id: I6aefd850e3e09deb37d73ff17e1154e0f5def867