Updated from global requirements

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