Merge "Finish activity when created by documents provider and documents...
Merge "Finish activity when created by documents provider and documents provider gone." into rvc-dev am: c4609477 am: 5fb252d0
Change-Id: I4a4f80e44e8023006bdc6a1e46ecc3a6893c2231