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

Change-Id: I22862a5b2d7a154551bbd53ed72a6d597a8beaae