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: e6cc5449 am: c796aba2 am: 01cc03b4
Change-Id: I73d7a520d60659782df19eda378ea75a33a34c61