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

Change-Id: I8aa20e13711cb4f7dfb7b7b711e21b9d9392984c