Updated from global requirements

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