Updated from global requirements

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