Updated from global requirements

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