Updated from global requirements

Change-Id: I8ad37eb2e149aa1bb51ec71988e8dbbf6243118e
Merge "Updated from global requirements"