Updated from global requirements

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