Updated from global requirements

Change-Id: I487ecac7d56d175f73e2414c888f456b72364ee6
Closes-Bug: #1333975