Merge "Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev...
Merge "Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc am: 74aac8d9" into nyc-mr1-dev-plus-aosp
am: 57fe0d1b
* commit '57fe0d1b':
Clear state when ProgressMessageCtrl. is canceled
Change-Id: I1c9fd5e1f4b01fddec6f8e3a042bb6398d6f0944