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

Change-Id: Ib3656f37c31da5f2c07160d0a725dbfea2fbd940