Updated from global requirements

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