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

Change-Id: Iddabc77d92830eb79327a2ca7a7bd3f9f2f1a786