Updated from global requirements

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