Updated from global requirements

Change-Id: I93d296e1f83b55557ddae44d2a724ef730708222