Updated from global requirements

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