Updated from global requirements

Change-Id: I689a2a07be66021840f1e7b483d5f341cbb2bc5a