Updated from global requirements

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