am 4af3c604: am b2de1ff5: am bb678c73: am c9830e5c: am f9e8640f: Merge "Disable update logic for market button." into jb-ub-now-indigo-rose

* commit '4af3c6047777f4fec0030c9806a37640fb004916':