Merge "Check for no error in getting planeLayout in lock" into rvc-dev am:...
Merge "Check for no error in getting planeLayout in lock" into rvc-dev am: 06e0cee7 am: 67927da8 am: ef1a3cc5 am: 6d9c750b
Change-Id: Ic41d78f789d3c9c09726f9098931856d924dbb79