Updated from global requirements

Change-Id: Id9ad5195dff8d65eed951061db5a34c31765b1b6