Updated from global requirements

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