Updated from global requirements

Change-Id: I21538cf8831f5aaab282a4df341303836a3d8326