Refactored code didn't make it into previous CL

Change-Id: I7ec93e783267d0c0fb39fbc8d0abe7270bdaea68
5 files changed