Updated from global requirements

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