Updated from global requirements

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