Updated from global requirements

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