Updated from global requirements

Change-Id: Ib8159135cfbf9148370ff3a9b47c376c886e9d82