Updated from global requirements

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