Treat noupdate="true" as noupdate. am: 5006aeac10 am: 2755c5bf8e
am: f7732ae04d

Change-Id: Iae3ba2364a2cfc785679265a79fb54309fb3505a