Updated from global requirements

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