Updated from global requirements

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