Updated from global requirements

Change-Id: Ib7edefa67f9f01d78d603c0dcd987ae178d88a4f