Updated from global requirements

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