Updated from global requirements

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