Updated from global requirements

Change-Id: I806a7cac2ce81eb1b1a6d10966cadd580b533037