Fix the ValidateInstallParams for re-installation am: 9a9a79786a am: d1f165a205
am: bcff8c4cef

Change-Id: I6984c796e9748cb2225a5d80e40d47e2a6260a6f