Updated from global requirements

Change-Id: Ic71ae06e070f186ede1bdecd685498fb5a5c3103