Updated from global requirements

Change-Id: I227e5611243ddcdcc779736c657fd7d6ac04dad7