Updated from global requirements

Change-Id: I00470eca0b3b4eb788e4184d8a37cac09bcd1260