Updated from global requirements

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