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

Change-Id: Id0e2e230e2ccd08f46cfd33cab5d7585e9623cf0