Updated from global requirements

Change-Id: Ie4800f92968c861712eb90fdc0b9155d2502b244