Updated from global requirements

Change-Id: Ica2d7db4dcb9d475aeaa2196ebdde28e0df6d76c