Merge changes from topic "135105735" into qt-r1-dev am: 896cdfa547
am: dbb897ee22

Change-Id: I02bdf3635298cc331e5b3bd794df772b759463ab