Merge "[Magnifier-43] Refactor to remove code duplication" into pi-dev
am: 90f197efe5

Change-Id: I8d3b9543022686525bb2f20fcc1c8d1d6f78ff06