Updated from global requirements

Change-Id: I2e0056a9c0514ed8697166827e5623e4cd3d913e