Updated from global requirements

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