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

Change-Id: I0105fd0ddab374f8d1e95cc9e45af094367edd30