Merge changes from topic "s5_histogram" into qt-qpr1-dev
am: b84383c66a

Change-Id: I4eaafdfcdc3f59434bd035896d589ea8a2277555