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

Change-Id: Id97e08f7dd7a3fbe58e8372334bf5d6f022cac18