Sync with global requirements

Change-Id: I125d07dfc53873ab9ecd5453a1f55cd46ae7155c