Updated from global requirements

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