Sync with global requirements

Change-Id: I1969b4d74363a8d77cbb5dac661874f3bea2e96c