Updated from global requirements

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