Updated from global requirements

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