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

Change-Id: I7e082d6d1ade5eb8d1c0be6db36c5d74276fed5d