Merge "Effect: Use local cached data for Effect commit" into security-aosp-mnc-mr1-release