Updated from global requirements

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