Sync with global requirements

Change-Id: I6667cf4e868abd4bc63d0d950f7a21c0b5e53f54
Merge "Sync with global requirements"