Updated from global requirements

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