Backport Photon fix into Oxygen.

Change-Id: I9e0b663d163d969473a8681e8836167b0453b754
Signed-off-by: Eric Williams <ericwill@redhat.com>