Updated from global requirements

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