Updated from global requirements

Change-Id: I5988d177e93d0b8e07e66e030e8d43fa7baf1e40