Updated from global requirements

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