Updated from global requirements

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