Updated from global requirements

Change-Id: I988ca5073a82f69c08b6ecdc8c018ec1a6908e77