Merge "Revert "RRO: Update target overlays after install"" into pi-dev am: ba750f9c27
am: 0c9621a24a

Change-Id: I5d56b47555c25587dc7ee40f5ef5cd3204288d97