Updated from global requirements

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