Updated from global requirements

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