Updated from global requirements

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