Updated from global requirements

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