Updated from global requirements

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