Updated from global requirements

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