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

* commit 'b2de1ff5a363a287ea2b3bf32c4388af4e5570b1':