Updated from global requirements

Change-Id: I0204bff4bbc4b47883c7f6111c358e610d4b4446