DO NOT MERGE - fix compile error from cherry pick due to member method becoming static.

Bug: 23953967
Change-Id: I0d1b11f94497b8853f343b6f63948ae03a1ec5ad
3 files changed