Updated from global requirements

Change-Id: I3cfcff5947c3794989d0bf7c6bc80469cd55072b