Updated from global requirements

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