Updated from global requirements

Change-Id: I8b166da9845a1d791ca19ff6713769b83c0b4137