Merge changes from topic "face_slice_update-qt-qpr1-dev" into qt-qpr1-dev
am: b61c1bb3ee

Change-Id: Id50fd1730d584d31219f953a465a3a0d5ba43c32