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

Change-Id: I48f402074410071d99418b6b6c7b7e2cf1cdfa96