Updated from global requirements

Change-Id: I5a18a0c807a47f6bf992030558a7cb69b85114df