Updated from global requirements

Change-Id: I4651f7d8fc28b420ac66d752a4c138a2ca77a327