Updated from global requirements

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