Updated from global requirements

Change-Id: Ib90882a1b17b75a042fb8832e6b49d32d43c5cd4