Updated from global requirements

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