Updated from global requirements

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