Updated from global requirements

Change-Id: I7080ecd84738030e9143f6b313522e2e5ebf6540