Updated from global requirements

Change-Id: I6d696d976a5693c046b707b990b950550325a893