Merge "Allow force resize message activity to be resumed" into oc-dev
am: 8cb56d9082

Change-Id: I7fd4ed727a0c548c5e444f77c856eb185427f605