Updated from global requirements

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