Updated from global requirements

Change-Id: I93eb390a9beeff50fdf58b2190ea8ce74609cd3e