Merge "Sync canvas proxy CTM (b/21945972)" into mnc-dev