Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c
am: 308e51173e

Change-Id: I7d741aa81543b95a6c3aeada9a259ba5a4c9b5bb