Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am:...
Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc am: 4012f08b
am: a99408ca
* commit 'a99408ca':
Change-Id: I154d00e0e0a14617262abf4800a7486b42266340