Sync with global requirements

Change-Id: I60397af3af7ca16cc7bf885c5ce7e5000da888fc