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 am: be0097ba0f am: f462a8c127 am: f574a9722f
am: 15d9e5097e

Change-Id: I0065f5856dba9aa6da8539fc7e505716e479f3ab