Updated from global requirements

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