Updated from global requirements

Change-Id: Ia029dd9c4b3409b26f1af2a0e392c95542118d2f