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 am: 078972c0
Change-Id: Ib71523b445271c99ab634ed99e032a8695696489