Updated from global requirements

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