Updated from global requirements

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