Updated from global requirements

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