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

Change-Id: I30af1bc87dc0b94e58eb2969ab8616b41c143f85