Updated from global requirements

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