Updated from global requirements

Change-Id: I8c4103a3d9804a206600b23888a8083f186e44d4
Updated from global requirements

Change-Id: I6dee4152e1e30f438f32e81a40e04abe67fb0187