Updated from global requirements

Change-Id: I884ce492d6de24c4bd26a65e10bcf2b6daee9177
Merge "Updated from global requirements"