Merge "Refactor duplicate code into single function" am: 1b118b032b
am: 3ea2bfe8c1

Change-Id: I371770b779fdef3abcc10bac062a9d05b8b93da7