Updated from global requirements

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