Updated from global requirements

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