[automerger skipped] DO NOT MERGE Updating the method name to match the functionality am: 11790d7fa6 -s ours am: 9556f8b921
am: 70d80a26dd

Change-Id: I37e9a66b6a704c97ab5ec423b7c0a5fb1d6b06a1