Updated from global requirements

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