Updated from global requirements

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