Updated from global requirements

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