Updated from global requirements

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