Updated from global requirements

Change-Id: I42e691082c2cbbd81cc0cddbf14f0b27b4e9a5b7