Updated from global requirements

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