am 0afc03a2: am f926462d: am 3126951b: Merge "Allow setting photos in managed profile" into mnc-dev

* commit '0afc03a2e3e1ccf547d4069c57d3d314a61dac65':
  Allow setting photos in managed profile