Updated from global requirements

Change-Id: I7863140d4e4a6f7e02fccda1b556786b9d0e16ab
Merge "Updated from global requirements"