Merge \\\"Remove --no_prereq flag from OTA script.\\\" am: bc450fc9c8 am: bd30d5fa16
am: 38f9a845ca

Change-Id: Id2149bae492959ba44a520efe7ec73d55fe1e823