Updated from global requirements

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