Sync with global requirements

Change-Id: I8333e17d8edaa5853ac47f9d53de8c44d1c5d5cb