Updated from global requirements

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