Updated from global requirements

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