Updated from global requirements

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