Updated from global requirements

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