Merge "Relax constraints on getting PlaneLayouts" into rvc-dev am: 28fcdf27e4 am: 9c886cd035

Change-Id: I64dacc5ee738e7aa67268d4da6125d7d4e336535