Updated from global requirements

Change-Id: Ic79c0367a0902e0a28d44b84174f132d41caa55b