Updated from global requirements

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