Updated from global requirements

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