Updated from global requirements

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