Updated from global requirements

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