Updated from global requirements

Change-Id: I51682a7a4b46a88598639c0e779857537dbc2e2c
Merge "Updated from global requirements"