[automerger skipped] Merge "Fix signature of recently changed methods"
am: 4b2f7576a0  -s ours

Change-Id: Ib0085e2a127a1b70be98b66b898b7fa04741f512