Snap for 5860054 from 271014e8325f17ac1fcf83dede7ce987c293fb2c to qt-qpr1-release

Change-Id: Id2b5606023752261dc90ad321b522ef0914fb69d