Updated from global requirements

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