Updated from global requirements

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