Updated from global requirements

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