Updated from global requirements

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