Updated from global requirements

Change-Id: I4b81481201d859679585d1885fa478ecc5238042