Updated from global requirements

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