Updated from global requirements

Change-Id: Ia98759b62696451ea77c7d2e11f05de0cd55dcab