Updated from global requirements

Change-Id: I3701c9964d442191de3a6581bcbc0b6f5e14ab26