Updated from global requirements

Change-Id: Id91358b7d4efe79a4be5190dcdb4b0b7cb40f19b