Updated from global requirements

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