Updated from global requirements

Change-Id: Iff770382f2d185e1075eb9a2c198fe54d653977e