Updated from global requirements

Change-Id: Ia530441999320b766dd71815e1e0182699c429a7