Updated from global requirements

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