Updated from global requirements

Change-Id: I4f3f8c2c6828b0ebe9e06eab409500808184b432