Merge \"Fixing issue with content description not being updated.\" into ub-launcher3-calgary
am: c6e5fdb7ac

Change-Id: I3101ee52939047bb1452ee50454330c90b09ce98