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

Change-Id: I6e8aedd746761799ce24f0b51859a8ad1c2aa9f8