Updated from global requirements

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