Updated from global requirements

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