Updated from global requirements

Change-Id: I077f7da22e2e70e2c08fba9e09a395350fa9cdb5