Merge "Revert "Revert "Revert "Enable low target sdk install block by default"""" into udc-dev