Updated from global requirements

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