Updated from global requirements

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