Updated from global requirements

Change-Id: I7503a6a56367f0d01a896441723df4fc3f3a7567