Merge changes from topic "b111394067-new-falsing-manager" into qt-dev
am: acd240fbb3

Change-Id: I83640ae5c6a6681eb33c87a70a629573f189d024