Updated from global requirements

Change-Id: I51cd96c220f539771c9ea4bb66d96f41d23b50f2