Updated from global requirements

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