Updated from global requirements

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