Merge \"Rename kCall to kCallOnMainOnly\"
am: d8f5f56f2d

Change-Id: Ie5595fd206aaedf81fe60b757e8cb11f5e82cc6e