Updated from global requirements

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