Updated from global requirements

Change-Id: I62eed515d1b17caf443db2fc424f1842be8ed8cd