Updated from global requirements

Change-Id: I02927d0bfeb61895cd63cb5e0215bc3dc902ebda