Merge "Fix unused-parameter warning" am: a2a7195e23 am: d05a784d55 am: 3fb5c68e04
am: 28edf080bf

Change-Id: If2d50fa3c38bb1001806f443473e8f194ed968f8