Updated from global requirements

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