Merge "[Script] Remove redundant conditional expressions"
am: c278acfeba

Change-Id: Icb2b91df50cb68607730c727edb767cddae0acc2