Updated from global requirements

Change-Id: Id3da9d10632b68df8017d4f3dc69cec6ff2f1eb1