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

Change-Id: I3e986d4069b95dd1ab8e67db28ea1e3cdcaca7b5