Updated from global requirements

Change-Id: Ic52ec85a60197ab60a686ed4418bdf48f18698ba