Updated from global requirements

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