Updated from global requirements

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