Updated from global requirements

Change-Id: I14d559fe337c6a06f0d2ff9ec0b4a9d3dd1b3238