Merge "Remove duplicate code when constructing PhotoInfo proto."
am: b327b63680

Change-Id: Ib3be3bdd7e2f1f022bbd37f01c12956992a8a456