Sync with global requirements

Change-Id: I39555d31cdc4e18dab971d2a6d192cb4ce268dee