Merge "Change code to use new method" am: 8337c6087b
am: 48160d7b07

Change-Id: I35e5bb543d7b279eb0023b01a176d110023dcaf6