Merge "Insert Change-Id into access right changes"