Updated from global requirements

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