Sync with global requirements

Change-Id: I8b30752d171fa957c58fd5a435bfe1ccfcc3d876
Merge "Sync with global requirements"