Updated from global requirements

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