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

Change-Id: I9a450d5de9359f98081db7ec9a63f8c6eb2562f2