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

Change-Id: Idcef3a5a9a0adb89bcffa1c5e1b4e0bcbd7fb880