Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
am: 736ba78a6e

Change-Id: I2b7421274bfd657575cc58ad6a0e35fd521e25d0