Updated from global requirements

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