Updated from global requirements

Change-Id: I03c975e6ec0b0e169f039fb71686a4fcc9d81c48