Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am: 07192ff60a am: 4e830d259a
am: bf6a177198

Change-Id: I09aba54f0d3bfc17861ccef2aba836751af7adb0