Sync with global requirements

Change-Id: Ie4c17c36e70e1ffb4f2c1384df0322521130939e