[automerger skipped] Merge "Update mock with new methods." am: 67b14253 am: db59da15
am: b07e1b8d -s ours
am skip reason: change_id Ic473349538a248c342c4666a856c9f0c0b903868 with SHA1 bc3ea3b6 is in history
Change-Id: I5b3a0f560d49d21f0b4c3fc0b73eeafb1db6bc4a