Updated from global requirements

Change-Id: I0d9612aff8db7db9c6f60086d08c791fa7b3947b