Merge commit '8d14dbe041199d611839140f1c9285fd4174e9f4' into merge_ub-launcher3-master_6877130

Change-Id: I624658ce682b55042a12faacd4cf0cfd5d3a9a56