Updated from global requirements

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