Updated from global requirements

Change-Id: I8c4103a3d9804a206600b23888a8083f186e44d4