Updated from global requirements

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