Updated from global requirements

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