Merge "Change lock to lockYCbCr for to get the actual y,cb,cr." am: c659375f3e am: c2c08b5be1 am: 2c2f19a131
am: ddac14243d

Change-Id: I5bbb504401dd4a34a37e5b865026f873a9e92bef