Updated from global requirements

Change-Id: I6d26b2a5ee5e351d14ca2217eaa808ba505d8535